Merge branch 'master' into match-block-not-needed
authorTshepang Lekhonkhobe <tshepang@gmail.com>
Thu, 18 Aug 2016 06:49:07 +0000 (08:49 +0200)
committerGitHub <noreply@github.com>
Thu, 18 Aug 2016 06:49:07 +0000 (08:49 +0200)

Trivial merge